From cd478e6f7daf0510bf0e8c6e226dafcc25a48641 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Fri, 6 Jan 2006 12:59:55 +0100 Subject: [PATCH] Move definition of pm_power_off to a more sensible location. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c | 2 -- linux-2.6-xen-sparse/arch/xen/kernel/reboot.c | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c index 96ee1a68ce..5e5d56cce6 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c @@ -40,8 +40,6 @@ #include #endif -void (*pm_power_off)(void) = NULL; - #ifdef CONFIG_X86_64 static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id) { } diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c index 311003e32c..644a2c1015 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c @@ -17,6 +17,13 @@ #include #include +#if defined(__i386__) || defined(__x86_64__) +/* + * Power off function, if any + */ +void (*pm_power_off)(void); +#endif + #define SHUTDOWN_INVALID -1 #define SHUTDOWN_POWEROFF 0 #define SHUTDOWN_REBOOT 1 -- 2.30.2